Slight cosmetic cleanup.

1999-11-09  Michael Fulbright  <drmike@redhat.com>

	* src/io-jpeg.c: Slight cosmetic cleanup.

	* src/io-pnm.c: Fixed raw PNM loading bug. Also discovered that ASCII
        PBM loading has a similar problem and will address tomorrow.

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 8da197276f974194b9bf53624762ca79f584e1a1..05e3329068be80436d4d9841d484399bd46c9a86 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,10 @@
+1999-11-09  Michael Fulbright  <drmike@redhat.com>
+
+       * src/io-jpeg.c: Slight cosmetic cleanup.
+
+       * src/io-pnm.c: Fixed raw PNM loading bug. Also discovered that ASCII
+        PBM loading has a similar problem and will address tomorrow.
+       
 1999-11-09  Havoc Pennington  <hp@pobox.com>
 
        * src/Makefile.am (libgdk_pixbuf_la_SOURCES): build the

diff --git a/gdk-pixbuf/io-jpeg.c b/gdk-pixbuf/io-jpeg.c
index 208ec01923ce8e03646b65c69d92cb3425ab024b..fd402d29ffff4b817d5dc5278d113291002c45fc 100644 (file)
--- a/gdk-pixbuf/io-jpeg.c
+++ b/gdk-pixbuf/io-jpeg.c
@@ -492,7 +492,7 @@ image_load_increment (gpointer data, guchar *buf, guint size)
                                rowptr = context->dptr;
                                for (i=0; i < cinfo->rec_outbuf_height; i++) {
                                        *lptr++ = rowptr;
-                                       rowptr += context->pixbuf->art_pixbuf->rowstride;;
+                                       rowptr += context->pixbuf->art_pixbuf->rowstride;
                                }
 
                                nlines = jpeg_read_scanlines (cinfo, lines,

diff --git a/gdk-pixbuf/io-pnm.c b/gdk-pixbuf/io-pnm.c
index c06eb8fbbb2d78a960a0f02b6d7eba0aa9dee2f2..7e409d3033ead051578901e6ed679174e42ee66e 100644 (file)
--- a/gdk-pixbuf/io-pnm.c
+++ b/gdk-pixbuf/io-pnm.c
@@ -67,6 +67,7 @@ typedef struct {
        guint                    width;
        guint                    height;
        guint                    maxval;
+       guint                    rowstride;
        PnmFormat                type;
 
        guint                    output_row;  /* last row to be completed */
@@ -116,7 +117,8 @@ explode_bitmap_into_buf (PnmLoaderContext *context)
 
        from = dptr + (wid - 1)/8;
        to   = dptr + (wid - 1) * 3;
-       bit  = 7 - (((y+1)*wid - 1) % 8);
+/*     bit  = 7 - (((y+1)*wid-1) % 8); */
+       bit  = 7 - ((wid-1) % 8); 
 
        /* get first byte and align properly */
        data = from[0];
@@ -124,6 +126,8 @@ explode_bitmap_into_buf (PnmLoaderContext *context)
 
        for (x = wid-1; x >= 0; x--) {
 
+/*             g_print ("%c",  (data & 1) ? '*' : ' '); */
+
                to[0] = to[1] = to[2] = (data & 1) ? 0x00 : 0xff;
 
                to -= 3;
@@ -137,6 +141,8 @@ explode_bitmap_into_buf (PnmLoaderContext *context)
                        data >>= 1;
                }
        }
+
+/*     g_print ("\n"); */
 }
 
 /* explode gray image row into rgb components in pixbuf */
@@ -367,6 +373,8 @@ pnm_read_raw_scanline (PnmLoaderContext *context)
 
        g_return_val_if_fail (context != NULL, PNM_FATAL_ERR);
 
+/*G_BREAKPOINT(); */
+
        inbuf = &context->inbuf;
 
        switch (context->type) {
@@ -386,16 +394,16 @@ pnm_read_raw_scanline (PnmLoaderContext *context)
        }
        
        numpix = MIN (numpix, context->width - context->output_col);
-       
+
        if (numpix == 0)
                return PNM_SUSPEND;
        
        context->dptr = context->pixels + 
-               context->output_row * context->width * 3;
+               context->output_row * context->rowstride;
        
        switch (context->type) {
        case PNM_FORMAT_PBM_RAW:
-               numbytes = numpix/8;
+               numbytes = numpix/8 + ((numpix % 8) ? 1 : 0);
                offset = context->output_col/8;
                break;
        case PNM_FORMAT_PGM_RAW:
@@ -412,10 +420,10 @@ pnm_read_raw_scanline (PnmLoaderContext *context)
        }
        
        memcpy (context->dptr + offset, inbuf->next_byte, numbytes);
-       
+
        inbuf->next_byte  += numbytes;
        inbuf->bytes_left -= numbytes;
-       
+
        context->output_col += numpix;
        if (context->output_col == context->width) {
                if ( context->type == PNM_FORMAT_PBM_RAW )
@@ -451,11 +459,11 @@ pnm_read_ascii_scanline (PnmLoaderContext *context)
        inbuf = &context->inbuf;
 
        context->dptr = context->pixels + 
-               context->output_row * context->width * 3;
+               context->output_row * context->rowstride;
 
        switch (context->type) {
        case PNM_FORMAT_PBM:
-               numval = 8;
+               numval = MIN (8, context->width - context->output_col);
                offset = context->output_col/8;
                break;
        case PNM_FORMAT_PGM:
@@ -478,6 +486,7 @@ pnm_read_ascii_scanline (PnmLoaderContext *context)
                if (context->type == PNM_FORMAT_PBM) {
                        mask = 0x80;
                        data = 0;
+                       numval = MIN (8, context->width - context->output_col);
                }
 
                old_next_byte  = inbuf->next_byte;
@@ -508,10 +517,12 @@ pnm_read_ascii_scanline (PnmLoaderContext *context)
                        }
                }
                
-               if (context->type == PNM_FORMAT_PBM)
-                       *dptr++ = value;
-               
-               context->output_col++;
+               if (context->type == PNM_FORMAT_PBM) {
+                       *dptr++ = data;
+                       context->output_col += 8;
+               } else {
+                       context->output_col++;
+               }
 
                if (context->output_col == context->width) {
                        if ( context->type == PNM_FORMAT_PBM )
@@ -584,6 +595,7 @@ image_load (FILE *f)
 
        inbuf = &context.inbuf;
 
+       file_off = 0;
        while (TRUE) {
                guint  num_to_read;
 
@@ -598,7 +610,7 @@ image_load (FILE *f)
                                1, num_to_read, f);
                inbuf->bytes_left += nbytes;
                inbuf->next_byte   = inbuf->buffer;
-               
+
                /* ran out of data and we haven't exited main loop */
                if (inbuf->bytes_left == 0) {
                        if (context.pixbuf)
@@ -621,6 +633,7 @@ image_load (FILE *f)
 
                /* scan until we hit image data */
                if (!context.did_prescan) {
+
                        if (skip_ahead_whitespace (inbuf) == NULL)
                                continue;
 
@@ -628,23 +641,18 @@ image_load (FILE *f)
                        context.output_row = 0;
                        context.output_col = 0;
 
-                       context.pixbuf = gdk_pixbuf_new(ART_PIX_RGB, 
-                                                        /*have_alpha*/ FALSE,
-                                                        8, 
-                                                        context.width,
-                                                        context.height);
-
-
-                       if (context.pixbuf == NULL) {
+                       context.rowstride = context.width * 3;
+                       context.pixels = g_malloc (context.height * 
+                                                  context.width  * 3);
+                       if (!context.pixels) {
                                /* Failed to allocate memory */
-                               g_error ("Couldn't allocate gdkpixbuf");
+                               g_error ("Couldn't allocate pixel buf");
                        }
-
-                       context.pixels = context.pixbuf->art_pixbuf->pixels;
                }
 
                /* if we got here we're reading image data */
                while (context.output_row < context.height) {
+
                        rc = pnm_read_scanline (&context);
 
                        if (rc == PNM_SUSPEND) {
@@ -669,54 +677,6 @@ image_load (FILE *f)
 
 }
 
-#if 0
-/**** Progressive image loading handling *****/
-
-/* these routines required because we are acting as a source manager for */
-/* libjpeg. */
-static void
-init_source (j_decompress_ptr cinfo)
-{
-       my_src_ptr src = (my_src_ptr) cinfo->src;
-
-       src->skip_next = 0;
-}
-
-
-static void
-term_source (j_decompress_ptr cinfo)
-{
-       /* XXXX - probably should scream something has happened */
-}
-
-
-/* for progressive loading (called "I/O Suspension" by libjpeg docs) */
-/* we do nothing except return "FALSE"                               */
-static boolean
-fill_input_buffer (j_decompress_ptr cinfo)
-{
-       return FALSE;
-}
-
-
-static void
-skip_input_data (j_decompress_ptr cinfo, long num_bytes)
-{
-       my_src_ptr src = (my_src_ptr) cinfo->src;
-       long   num_can_do;
-
-       /* move as far as we can into current buffer */
-       /* then set skip_next to catch the rest      */
-       if (num_bytes > 0) {
-               num_can_do = MIN (src->pub.bytes_in_buffer, num_bytes);
-               src->pub.next_input_byte += (size_t) num_can_do;
-               src->pub.bytes_in_buffer -= (size_t) num_can_do;
-
-               src->skip_next = num_bytes - num_can_do;
-       }
-}
-#endif
-
 /* 
  * func - called when we have pixmap created (but no image data)
  * user_data - passed as arg 1 to func
@@ -852,6 +812,7 @@ image_load_increment (gpointer data, guchar *buf, guint size)
                        }
 
                        context->pixels = context->pixbuf->art_pixbuf->pixels;
+                       context->rowstride = context->pixbuf->art_pixbuf->rowstride;
 
                        /* Notify the client that we are ready to go */
                        (* context->prepared_func) (context->pixbuf,
@@ -861,7 +822,6 @@ image_load_increment (gpointer data, guchar *buf, guint size)
 
                /* if we got here we're reading image data */
                while (context->output_row < context->height) {
-
                        rc = pnm_read_scanline (context);
 
                        if (rc == PNM_SUSPEND) {
@@ -872,6 +832,7 @@ image_load_increment (gpointer data, guchar *buf, guint size)
                                g_warning ("io-pnm.c: error reading rows..\n");
                                return FALSE;
                        } else if (rc == PNM_OK) {
+
                                /* send updated signal */
                                (* context->updated_func) (context->pixbuf,
                                                 context->user_data,